Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Viscosity #45

Merged
merged 15 commits into from
Apr 5, 2024
Merged

Viscosity #45

merged 15 commits into from
Apr 5, 2024

Conversation

dlparkhurst
Copy link
Contributor

Need to merge these changes into phreeqc master, and then propogate to IPhreeqc, PhreeqcRM, and all phreeqc programs.

@scharlton2 scharlton2 merged commit f784b81 into usgs-coupled:master Apr 5, 2024
4 of 5 checks passed
scharlton2 pushed a commit that referenced this pull request Apr 18, 2024
bae20ea7 Merge pull request #45 from dlparkhurst/viscosity
d18452f3 All test cases run. Fixed CALCULATED_VALUES and RATES in Amm.dat and phreeqc.dat
5c6d1c5a Tony's changes Mar 15, 2024
39130824 Tony's changes Mar 15, 2024
bc1f8f86 Tony's changes Mar 15, 2024
3318883e Tony's Mar 15, changes.
77038cb6 modified NH3 from Tony's Amm.dat
e510f752 Tony's changes 2/12/2024

git-subtree-dir: database
git-subtree-split: bae20ea7e849a914e6abea15c71cdad69db68db7
scharlton2 pushed a commit that referenced this pull request Apr 18, 2024
7284fed5 Fixed alignment for some of the utf-8
7babc4b4 Changed sprintf to snprintf
0d902855 Changed encoding to utf-8
3e00b232 Merge pull request #45 from dlparkhurst/viscosity
4aa80348 merged master into viscosity
166aec19 Tony tweak of t3 in transport.cpp
6a4443d0 used density_x. Added xsoln_visc test case
4ad0613f removed viscos_x and density_x
269d107f Tony's changes Mar 15, 2024
f50111a5 Tony's changes with added test cases. All test cases run

git-subtree-dir: src
git-subtree-split: 7284fed50f48610d24dc565cb530f6444940b4a3
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants